Set G_LOG_USE_STRUCTURED globally

It doesn't make much sense to set this in per-directory
meson files, since that makes use use different logging
facilities in different parts of the project. Set it
globally.

diff --git a/config.h.meson b/config.h.meson
index 1968bb9cbeda18991e2a8068badd022cfdd9daba..549a6773791c6756bfcd77327d3fc264d4c48475 100644 (file)
--- a/config.h.meson
+++ b/config.h.meson
@@ -1,8 +1,9 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1
 
+/* Use structured logging */
+#define G_LOG_STRUCTURED 1
+
 /* The prefix for our gettext translation domains. */
 #mesondefine GETTEXT_PACKAGE
 

diff --git a/gtk/css/meson.build b/gtk/css/meson.build
index 6b2456192866f2be63d270a767bfa51a8ec0262c..501411f917183e59f4b04433e72c961295359ff9 100644 (file)
--- a/gtk/css/meson.build
+++ b/gtk/css/meson.build
@@ -47,7 +47,6 @@ libgtk_css = static_library('gtk_css',
                             c_args: [
                               '-DGTK_COMPILATION',
                               '-DG_LOG_DOMAIN="Gtk"',
-                              '-DG_LOG_STRUCTURED=1',
                             ] + common_cflags,
                             link_args: common_ldflags)